From 186366e27968bd4062de3039ea5d35c2a4111a06 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Thu, 23 Feb 2006 15:33:08 +0100 Subject: [PATCH] Remove some unnecessary diffs vs. native Linux. We now don't use the Xen FLAT_foo segment selectors at all. Signed-off-by: Keir Fraser --- linux-2.6-xen-sparse/arch/i386/kernel/traps-xen.c | 6 ------ linux-2.6-xen-sparse/arch/x86_64/kernel/traps-xen.c | 6 ------ .../include/asm-i386/mach-xen/asm/segment.h | 6 ++++-- 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/linux-2.6-xen-sparse/arch/i386/kernel/traps-xen.c b/linux-2.6-xen-sparse/arch/i386/kernel/traps-xen.c index 34576b17fa..c7b1518503 100644 --- a/linux-2.6-xen-sparse/arch/i386/kernel/traps-xen.c +++ b/linux-2.6-xen-sparse/arch/i386/kernel/traps-xen.c @@ -1096,12 +1096,6 @@ void __init trap_init(void) void smp_trap_init(trap_info_t *trap_ctxt) { trap_info_t *t = trap_table; - int i; - - for (i = 0; i < 256; i++) { - trap_ctxt[i].vector = i; - trap_ctxt[i].cs = FLAT_KERNEL_CS; - } for (t = trap_table; t->address; t++) { trap_ctxt[t->vector].flags = t->flags; diff --git a/linux-2.6-xen-sparse/arch/x86_64/kernel/traps-xen.c b/linux-2.6-xen-sparse/arch/x86_64/kernel/traps-xen.c index 0568511c06..bcd0f0627d 100644 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/traps-xen.c +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/traps-xen.c @@ -997,12 +997,6 @@ void __init trap_init(void) void smp_trap_init(trap_info_t *trap_ctxt) { trap_info_t *t = trap_table; - int i; - - for (i = 0; i < 256; i++) { - trap_ctxt[i].vector = i; - trap_ctxt[i].cs = FLAT_KERNEL_CS; - } for (t = trap_table; t->address; t++) { trap_ctxt[t->vector].flags = t->flags; diff --git a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/segment.h b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/segment.h index 96a509c93e..f9a75b33a3 100644 --- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/segment.h +++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/segment.h @@ -87,9 +87,11 @@ /* Simple and small GDT entries for booting only */ -#define __BOOT_CS FLAT_KERNEL_CS +#define GDT_ENTRY_BOOT_CS 2 +#define __BOOT_CS (GDT_ENTRY_BOOT_CS * 8) -#define __BOOT_DS FLAT_KERNEL_DS +#define GDT_ENTRY_BOOT_DS (GDT_ENTRY_BOOT_CS + 1) +#define __BOOT_DS (GDT_ENTRY_BOOT_DS * 8) /* The PnP BIOS entries in the GDT */ #define GDT_ENTRY_PNPBIOS_CS32 (GDT_ENTRY_PNPBIOS_BASE + 0) -- 2.30.2